Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix deletion of looping sounds #6324

Merged
merged 1 commit into from
Aug 27, 2024

Conversation

Goober5000
Copy link
Contributor

Per the comment earlier in this function, both -1 and -2 are expected values for sound indexes. Update the sound validity check accordingly. Fixes an assertion in obj_snd_delete() encountered by FotG when a sound index was -2.

@Goober5000 Goober5000 added fix A fix for bugs, not-a-bugs, and/or regressions. sound A feature or issue specific to music and sound Requested by Active Mod A feature request that has been requested by a mod that is actively in development. labels Aug 27, 2024
@Goober5000 Goober5000 added this to the Release 24.2 milestone Aug 27, 2024
@Goober5000 Goober5000 marked this pull request as draft August 27, 2024 18:57
@Goober5000 Goober5000 marked this pull request as ready for review August 27, 2024 19:00
code/ship/ship.cpp Outdated Show resolved Hide resolved
Per the comment earlier in this function, both -1 and -2 are expected values for sound indexes.  Update the sound validity check accordingly.  Fixes an assertion in `obj_snd_delete()` encountered by FotG when a sound index was -2.
@Goober5000 Goober5000 merged commit b98b8f2 into scp-fs2open:master Aug 27, 2024
16 checks passed
@Goober5000 Goober5000 deleted the fotg_sound_fix branch August 27, 2024 19:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fix A fix for bugs, not-a-bugs, and/or regressions. Requested by Active Mod A feature request that has been requested by a mod that is actively in development. sound A feature or issue specific to music and sound
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants